diff --git a/src/wallet/api/transaction_history.cpp b/src/wallet/api/transaction_history.cpp
index 6cc5a961c..3ebcc041e 100644
--- a/src/wallet/api/transaction_history.cpp
+++ b/src/wallet/api/transaction_history.cpp
@@ -28,9 +28,17 @@
 //
 // Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
 
+
 #include "transaction_history.h"
+#include "transaction_info.h"
+#include "wallet.h"
+
+#include "crypto/hash.h"
+#include "wallet/wallet2.h"
+#include "contrib/epee/include/string_tools.h"
 
 #include <string>
+#include <list>
 
 namespace Bitmonero {
 
@@ -61,7 +69,24 @@ std::vector<TransactionInfo *> TransactionHistoryImpl::getAll() const
 
 void TransactionHistoryImpl::refresh()
 {
+    // TODO: configurable values;
+    uint64_t min_height = 0;
+    uint64_t max_height = (uint64_t)-1;
 
+    // TODO: delete old transactions;
+
+    std::list<std::pair<crypto::hash, tools::wallet2::payment_details>> payments;
+    m_wallet->m_wallet->get_payments(payments, min_height, max_height);
+    for (std::list<std::pair<crypto::hash, tools::wallet2::payment_details>>::const_iterator i = payments.begin(); i != payments.end(); ++i) {
+        const tools::wallet2::payment_details &pd = i->second;
+        std::string payment_id = string_tools::pod_to_hex(i->first);
+        if (payment_id.substr(16).find_first_not_of('0') == std::string::npos)
+            payment_id = payment_id.substr(0,16);
+        // TODO
+        TransactionInfo * ti = new TransactionInfo();
+
+        //output.insert(std::make_pair(pd.m_block_height, std::make_pair(true, (boost::format("%20.20s %s %s %s") % print_money(pd.m_amount) % string_tools::pod_to_hex(pd.m_tx_hash) % payment_id % "-").str())));
+    }
 }
 
 TransactionInfo *TransactionHistoryImpl::transaction(int index) const
diff --git a/src/wallet/api/transaction_info.h b/src/wallet/api/transaction_info.h
index 2ed8157f7..3aae19a64 100644
--- a/src/wallet/api/transaction_info.h
+++ b/src/wallet/api/transaction_info.h
@@ -34,6 +34,8 @@
 
 namespace Bitmonero {
 
+class TransactionHistoryImpl;
+
 class TransactionInfoImpl : public TransactionInfo
 {
 public:
@@ -47,6 +49,21 @@ public:
     virtual std::string address() const;
     virtual std::time_t timestamp() const;
     virtual std::string paymentId() const;
+
+private:
+    int         m_direction;
+    bool        m_hold;
+    bool        m_failed;
+    uint64_t    m_amount;
+    uint64_t    m_fee;
+    uint64_t    b_blockheight;
+    std::string m_address;
+    std::time_t m_timestamp;
+    std::string m_paymentid;
+
+
+    friend class TransactionHistoryImpl;
+
 };
 
 } // namespace