* Removed deprecated text-render computation

* Added accounts types (savings and checking)
  * FS flush optimized balance computation
  * Automatic daily rate growth computations

Client/Account.cs

@@ -8,14 +8,17 @@ namespace Client
 {
     public class Account
     {
+        public enum AccountType { Savings, Checking }
         public decimal balance;
         public List<Transaction> History { get; }
-        public Account(decimal balance)
+        public AccountType type;
+        public Account(decimal balance, AccountType type)
         {
             History = new List<Transaction>();
             this.balance = balance;
+            this.type = type;
         }
-        public Account(Account copy) : this(copy.balance)
+        public Account(Account copy) : this(copy.balance, copy.type)
             => History.AddRange(copy.History);
         public Account AddTransaction(Transaction tx)
         {
@@ -26,9 +29,10 @@ namespace Client
         public static Account Parse(string s)
         {
             var data = s.Split('{');
-            if(!decimal.TryParse(data[0], out var balance))
+            var attr = data[0].Split('&');
+            if(attr.Length!=2 || !decimal.TryParse(attr[0], out var balance) || !int.TryParse(attr[1], out var type))
                 throw new ParseException("String did not represent a valid account");
-            Account a = new Account(balance);
+            Account a = new Account(balance, (AccountType)type);
             for (int i = 1; i < data.Length; ++i)
                 a.AddTransaction(Transaction.Parse(data[i]));
             return a;
@@ -38,7 +42,7 @@ namespace Client
         {
             try
             {
-                account = Account.Parse(s);
+                account = Parse(s);
                 return true;
             }
             catch

Client/BankNetInteractor.cs

@@ -215,10 +215,10 @@ namespace Client
             return RegisterPromise(pID);
         }
 
-        public async virtual Task<Promise> CreateAccount(string accountName)
+        public async virtual Task<Promise> CreateAccount(string accountName, bool checking)
         {
             await StatusCheck(true);
-            client.Send(CreateCommandMessage("Account_Create", DataSet(sessionID, accountName), out long PID));
+            client.Send(CreateCommandMessage("Account_Create", DataSet(sessionID, accountName, checking), out long PID));
             return RegisterEventPromise(PID, p =>
             {
                 RefreshSession(p);

Client/ConsoleForms/Graphics/TextView.cs

@@ -116,44 +116,6 @@ namespace Client.ConsoleForms.Graphics
             }
             Done:
             return generate.ToArray();
-            for (int i = 0; i < text.Length; ++i)
-            {
-                if (generate.Count == 0)
-                {
-                    string[] split = Subsplit(text[i], maxWidth);
-                    for (int j = 0; j < split.Length; ++j)
-                        if (!generate.Add(split[j]))
-                            goto Generated;
-                }
-                else
-                {
-                    if (WillSubSplit(text[i], maxWidth))
-                    {
-                        int startAdd = 0;
-                        string[] split;
-                        if (generate[generate.Count - 1].Length != maxWidth)
-                        {
-                            startAdd = 1;
-                            split = Subsplit(generate[generate.Count - 1] + " " + text[i], maxWidth);
-                            generate[generate.Count - 1] = split[0];
-                        }
-                        else split = Subsplit(text[i], maxWidth);
-                        for (int j = startAdd; j < split.Length; ++j)
-                            if (!generate.Add(split[j]))
-                                goto Generated;
-                    }
-                    else
-                    {
-                        if (generate[generate.Count - 1].Length + text[i].Length < maxWidth)
-                            generate[generate.Count - 1] += " " + text[i];
-                        else if (!generate.Add(text[i]))
-                            break;
-                    }
-                }
-            }
-
-            Generated:
-            return generate.ToArray();
         }
 
         private static string[] Subsplit(string s, int max)

Client/Context/SessionContext.cs

@@ -21,14 +21,12 @@ namespace Client
         private bool scheduleDestroy;
         private Promise userDataGetter;
         private Promise accountsGetter;
-        private Promise remoteAccountsGetter;
-        private Promise remoteUserGetter;
         private List<string> accounts = null;
         private string username;
         private bool isAdministrator = false;
         
         // Stores personal accounts
-        private readonly FixedQueue<Tuple<string, decimal>> accountDataCache = new FixedQueue<Tuple<string, decimal>>(64);
+        private readonly FixedQueue<Tuple<string, Account>> accountDataCache = new FixedQueue<Tuple<string, Account>>(64);
 
         // Stores remote account data
         private readonly FixedQueue<Tuple<string, string>> remoteUserCache = new FixedQueue<Tuple<string, string>>(8);
@@ -52,7 +50,7 @@ namespace Client
             {
                 ButtonView view = listener as ButtonView;
 
-                void ShowAccountData(string name, decimal balance)
+                void ShowAccountData(string name, decimal balance, Account.AccountType type)
                 {
                     // Build dialog view manually
                     var show = new DialogView(
@@ -69,7 +67,11 @@ namespace Client
                         .AddNested(new ViewData("Options").AddNestedSimple("Option", GetIntlString("GENERIC_dismiss")))
 
                         // Message
-                        .AddNestedSimple("Text", GetIntlString("SE_info").Replace("$0", name).Replace("$1", balance.ToString())),
+                        .AddNestedSimple("Text",
+                            GetIntlString("SE_info")
+                                .Replace("$0", name)
+                                .Replace("$1", GetIntlString(type == Account.AccountType.Savings ? "SE_acc_saving" : "SE_acc_checking"))
+                                .Replace("$2", balance.ToTruncatedString())),
 
                         // No translation (it's already handled)
                         LangManager.NO_LANG);
@@ -92,13 +94,14 @@ namespace Client
                             controller.Popup(GetIntlString("GENERIC_error"), 3000, ConsoleColor.Red);
                         else
                         {
-                            accountDataCache.Enqueue(new Tuple<string, decimal>(view.Text, act.balance)); // Cache result
+                            // Cache result (don't cache savings accounts because their value updates pretty frequently)
-                            ShowAccountData(view.Text, act.balance);
+                            if (act.type!=Account.AccountType.Savings) accountDataCache.Enqueue(new Tuple<string, Account>(view.Text, act));
+                            ShowAccountData(view.Text, act.balance, act.type);
                         }
 
                     };
                 }
-                else ShowAccountData(account.Item1, account.Item2);
+                else ShowAccountData(account.Item1, account.Item2.balance, account.Item2.type);
             }
 
             options.GetView<ButtonView>("view").SetEvent(v =>
@@ -170,13 +173,42 @@ namespace Client
 
             // Actual "create account" input box thingy
             var input = GetView<InputView>("account_create");
-            input.SubmissionsListener = __ =>
+
+            int accountType = -1;
+            ListView accountTypes = null;
+            accountTypes = GenerateList(
+                new string[] {
+                    GetIntlString("SE_acc_checking"),
+                    GetIntlString("SE_acc_saving")
+                }, v =>
+                {
+                    accountType = accountTypes.SelectedView;
+                    input.Inputs[1].Text = (v as ButtonView).Text;
+                    CreateAccount();
+                }, true);
+            input.Inputs[1].Text = GetIntlString("SE_acc_sel");
+            input.SubmissionsListener = inputView =>
             {
+                if (inputView.SelectedField == 1)
+                    Show(accountTypes); // Show account type selection menu
+                else CreateAccount();
+                
+            };
+            void CreateAccount()
+            {
+                bool hasError = false;
+                if (accountType == -1)
+                {
+                    hasError = true;
+                    input.Inputs[1].SelectBackgroundColor = ConsoleColor.Red;
+                    input.Inputs[1].BackgroundColor = ConsoleColor.DarkRed;
+                    controller.Popup(GetIntlString("SE_acc_nosel"), 2500, ConsoleColor.Red);
+                }
                 if (input.Inputs[0].Text.Length == 0)
                 {
                     input.Inputs[0].SelectBackgroundColor = ConsoleColor.Red;
                     input.Inputs[0].BackgroundColor = ConsoleColor.DarkRed;
-                    controller.Popup(GetIntlString("ERR_empty"), 3000, ConsoleColor.Red);
+                    if(!hasError) controller.Popup(GetIntlString("ERR_empty"), 3000, ConsoleColor.Red);
                 }
                 else
                 {
@@ -188,7 +220,7 @@ namespace Client
                     else
                     {
                         Show("account_stall");
-                        Promise accountPromise = Promise.AwaitPromise(interactor.CreateAccount(input.Inputs[0].Text));
+                        Promise accountPromise = Promise.AwaitPromise(interactor.CreateAccount(input.Inputs[0].Text, accountType==0));
                         accountPromise.Subscribe = p =>
                         {
                             if (bool.Parse(p.Value))
@@ -201,11 +233,17 @@ namespace Client
                         };
                     }
                 }
-            };
+            }
+
             input.InputListener = (v, c, i, t) =>
             {
                 c.BackgroundColor = v.DefaultBackgroundColor;
                 c.SelectBackgroundColor = v.DefaultSelectBackgroundColor;
+                if (v.IndexOf(c) == 1)
+                {
+                    Show(accountTypes);
+                    return false; // Don't process key event
+                }
                 return true;
             };
 
@@ -251,7 +289,7 @@ namespace Client
                         break;
                     case 1:
                         Show("data_fetch");
-                        remoteUserGetter = Promise.AwaitPromise(interactor.ListUsers());
+                        Promise remoteUserGetter = Promise.AwaitPromise(interactor.ListUsers());
                         remoteUserGetter.Subscribe = p =>
                         {
                             remoteUserGetter.Unsubscribe();
@@ -266,10 +304,10 @@ namespace Client
                         else
                         {
                             Show("data_fetch");
-                            remoteAccountsGetter = Promise.AwaitPromise(interactor.ListAccounts(user));
+                            Promise remoteAccountsGetter = Promise.AwaitPromise(interactor.ListAccounts(user));
                             remoteAccountsGetter.Subscribe = p =>
                             {
-                                remoteUserGetter.Unsubscribe();
+                                remoteAccountsGetter.Unsubscribe();
                                 Hide("data_fetch");
 
                                 Show(GenerateList(p.Value.Split('&').ForEach(Support.FromBase64String), sel => v.Inputs[2].Text = acc2 = (sel as ButtonView).Text, true));
@@ -365,12 +403,10 @@ namespace Client
             }
         }
 
-        private ListView GenerateList(string[] data, SubmissionEvent onclick, bool exitOnSubmit = false)
+        private ListView GenerateList(string[] data, SubmissionEvent onclick, bool exitOnSubmit = false, bool hideOnBack = true)
         {
-            var list = GetView<ListView>("account_show");
+            //var list = GetView<ListView>("account_show");
-            list.RemoveIf(t => !t.Item1.Equals("close"));
+            var list = new ListView(new ViewData("ListView").SetAttribute("padding_left", 2).SetAttribute("padding_right", 2).SetAttribute("border", 8), LangManager.NO_LANG);
-            ButtonView exit = list.GetView<ButtonView>("close");
-            exit.SetEvent(_ => Hide(list));
             if (data.Length == 1 && data[0].Length == 0) return list;
             bool b = data.Length == 1 && data[0].Length == 0;
             Tuple<string, View>[] listData = new Tuple<string, View>[data.Length - (b ? 1 : 0)];
@@ -385,8 +421,8 @@ namespace Client
                     });
                     listData[i] = new Tuple<string, View>(t.Text, t);
                 }
-            list.RemoveIf(t => !t.Item1.Equals("close"));
             list.AddViews(0, listData); // Insert generated buttons before predefined "close" button
+            if (hideOnBack) list.OnBackEvent = v => Hide(v);
             return list;
         }
 
@@ -422,7 +458,7 @@ namespace Client
             controller.Popup(GetIntlString($"SE_{(automatic ? "auto" : "")}lo"), 2500, ConsoleColor.DarkMagenta, () => manager.LoadContext(new NetContext(manager)));
         }
 
-        private Tuple<string, decimal> AccountLookup(string name)
+        private Tuple<string, Account> AccountLookup(string name)
         {
             foreach (var cacheEntry in accountDataCache)
                 if (cacheEntry.Item1.Equals(name))

Client/Resources/Layout/Session.xml

@@ -128,6 +128,7 @@
     padding_bottom="1">
     <Fields>
       <Field>@string/SE_account_name</Field>
+      <Field>@string/SE_acc_label</Field>
     </Fields>
     <Text>@string/SE_account_create</Text>
   </InputView>
@@ -168,7 +169,8 @@
     padding_left="2"
     padding_right="2"
     padding_top="1"
-    padding_bottom="1">
+    padding_bottom="1"
+    border="4">
     <Options>
       <Option>@string/GENERIC_negative</Option>
       <Option>@string/GENERIC_positive</Option>

Client/Resources/Strings/en_GB/strings.xml

@@ -97,6 +97,11 @@ Is this correct?</Entry>
 	<Entry name="SE_pwdu">Update password</Entry>
     <Entry name="SE_exit">Log out</Entry>
     <Entry name="SE_open">Open an account</Entry>
+    <Entry name="SE_acc_label">Select account type:</Entry>
+    <Entry name="SE_acc_sel">Select...</Entry>
+    <Entry name="SE_acc_saving">Savings account</Entry>
+    <Entry name="SE_acc_checking">Checking account</Entry>
+    <Entry name="SE_acc_nosel">Please select an account type!</Entry>
     <Entry name="SE_close">Close account</Entry>
     <Entry name="SE_delete">Delete user account</Entry>
     <Entry name="SE_delete_warn">WARNING: This will delete the current user and all connected accounts!
@@ -109,7 +114,8 @@ Are you sure you would like to continue?</Entry>
 Available balance: $0 SEK</Entry>
     <Entry name="SE_checking">Checking...</Entry>
     <Entry name="SE_info">Name: $0
-Balance: $1 SEK</Entry>
+Account type: $1
+Balance: $2 SEK</Entry>
 	<Entry name="SE_autolo">You were automatically logged out due to inactivity</Entry>
 	<Entry name="SE_lo">Logged out</Entry>
 	<Entry name="SE_updatestall">Updating password...</Entry>

Client/Resources/Strings/en_US/strings.xml

@@ -97,6 +97,11 @@ Is this correct?</Entry>
 	<Entry name="SE_pwdu">Update password</Entry>
     <Entry name="SE_exit">Log out</Entry>
     <Entry name="SE_open">Open an account</Entry>
+    <Entry name="SE_acc_label">Select account type:</Entry>
+    <Entry name="SE_acc_sel">Select...</Entry>
+    <Entry name="SE_acc_saving">Savings account</Entry>
+    <Entry name="SE_acc_checking">Checking account</Entry>
+    <Entry name="SE_acc_nosel">Please select an account type!</Entry>
     <Entry name="SE_close">Close account</Entry>
     <Entry name="SE_delete">Delete user account</Entry>
     <Entry name="SE_delete_warn">WARNING: This will delete the current user and all connected accounts!

Client/Resources/Strings/sv_SE/strings.xml

@@ -102,6 +102,11 @@ Till kontot: $2
 	<Entry name="SE_pwdu">Uppdatera lösenord</Entry>
     <Entry name="SE_exit">Logga ut</Entry>
     <Entry name="SE_open">Öppna ett konto</Entry>
+    <Entry name="SE_acc_label">Välj kontotyp:</Entry>
+    <Entry name="SE_acc_sel">Välj...</Entry>
+    <Entry name="SE_acc_saving">Sparkonto</Entry>
+    <Entry name="SE_acc_checking">Lönekonto</Entry>
+    <Entry name="SE_acc_nosel">Vänligen välj en kontotyp!</Entry>
     <Entry name="SE_close">Stäng konto</Entry>
     <Entry name="SE_delete">Radera användare</Entry>
     <Entry name="SE_delete_warn">VARNING: Detta kommer att radera den nuvarande användaren

Common/Support.cs

@@ -203,6 +203,15 @@ namespace Tofvesson.Crypto
             return result;
         }
 
+        public static string ToTruncatedString(this decimal d, int maxdecimals = 3)
+        {
+            if (maxdecimals < 0) maxdecimals = 0;
+            StringBuilder builder = new StringBuilder(d.ToString());
+            int decimalIdx = builder.IndexOf('.');
+            if (builder.Length - decimalIdx - 1 > maxdecimals) builder.Length = decimalIdx + maxdecimals + 1;
+            if (maxdecimals == 0) --builder.Length;
+            return builder.ToString();
+        }
 
 
         //  --    Net    --
@@ -420,6 +429,14 @@ namespace Tofvesson.Crypto
 
 
         //  --    Misc    --
+        public static int IndexOf(this StringBuilder s, char c)
+        {
+            for (int i = 0; i < s.Length; ++i)
+                if (s[i] == c)
+                    return i;
+            return -1;
+        }
+
         // Allows deconstruction when iterating over a collection of Tuples
         public static void Deconstruct<T1, T2>(this Tuple<T1, T2> tuple, out T1 key, out T2 value)
         {

Server/Database.cs

@@ -193,7 +193,9 @@ namespace Server
             {
                 writer.WriteStartElement("Account");
                 writer.WriteElementString("Name", acc.name);
-                writer.WriteElementString("Balance", acc.balance.ToString());
+                writer.WriteElementString("Balance", acc.UncomputedBalance.ToString());
+                writer.WriteElementString("ChangeTime", acc.dateUpdated.ToString());
+                writer.WriteElementString("Type", ((int)acc.type).ToString());
                 foreach (var tx in acc.History)
                 {
                     writer.WriteStartElement("Transaction");
@@ -284,7 +286,7 @@ namespace Server
             return null;
         }
 
-        public bool AddTransaction(string sender, string recipient, decimal amount, string fromAccount, string toAccount, string message = null)
+        public bool AddTransaction(string sender, string recipient, decimal amount, string fromAccount, string toAccount, decimal ratePerDay, string message = null)
         {
             User from = FirstUser(u => u.Name.Equals(sender));
             User to = FirstUser(u => u.Name.Equals(recipient));
@@ -297,18 +299,18 @@ namespace Server
                 (from == null && !to.IsAdministrator) ||
                 toAcc == null ||
                 (from != null && fromAcc == null) ||
-                (from != null && fromAcc.balance<amount)
+                (from != null && fromAcc.ComputeBalance(ratePerDay)<amount)
                 ) return false;
 
             Transaction tx = new Transaction(from == null ? "System" : from.Name, to.Name, amount, message, fromAccount, toAccount);
             toAcc.History.Add(tx);
-            toAcc.balance += amount;
+            toAcc.UpdateBalance(amount, ratePerDay);
             AddUser(to, false); // Let's not flush unnecessarily
             //UpdateUser(to); // For debugging: Force a flush
             if (from != null)
             {
                 fromAcc.History.Add(tx);
-                fromAcc.balance -= amount;
+                fromAcc.UpdateBalance(-amount, ratePerDay);
                 AddUser(from, false);
             }
             return true;
@@ -488,34 +490,64 @@ namespace Server
             }
         }
 
-        public class Account
+        public sealed class Account
         {
+            public enum AccountType { Savings, Checking }
             public User owner;
-            public decimal balance;
+            private decimal _balance;
             public string name;
             public List<Transaction> History { get; }
-            public Account(User owner, decimal balance, string name)
+            public AccountType type;
+            public long dateUpdated;
+            public decimal UncomputedBalance {
+                get => _balance;
+
+                set
+                {
+                    _balance = value;
+                    dateUpdated = DateTime.Now.Ticks;
+                }
+            }
+
+            public Account(User owner, decimal balance, string name, AccountType type, long dateUpdated)
             {
                 History = new List<Transaction>();
                 this.owner = owner;
-                this.balance = balance;
+                this._balance = balance;
                 this.name = name;
+                this.type = type;
+                this.dateUpdated = dateUpdated;
             }
-            public Account(Account copy) : this(copy.owner, copy.balance, copy.name)
+
+            // Create a deep copy of the given account
+            public Account(Account copy) : this(copy.owner, copy._balance, copy.name, copy.type, copy.dateUpdated)
             {
                 // Value copy, not reference copy
                 foreach (var tx in copy.History)
                     History.Add(new Transaction(tx.from, tx.to, tx.amount, tx.meta, tx.fromAccount, tx.toAccount));
             }
+
+            // Add a transaction to the tx history
             public Account AddTransaction(Transaction tx)
             {
                 History.Add(tx);
                 return this;
             }
 
-            public override string ToString()
+            // Compute balance growth with a daily rate for savings accounts (no growth for checking accounts)
+            public decimal ComputeBalance(decimal ratePerDay)
+                => _balance + (type==AccountType.Savings ? (((decimal)(DateTime.Now.Ticks - dateUpdated) / TimeSpan.TicksPerDay) * ratePerDay * _balance) : 0);
+
+            public decimal UpdateBalance(decimal change, decimal ratePerDay)
             {
-                StringBuilder builder = new StringBuilder(balance.ToString());
+                decimal d = ComputeBalance(ratePerDay) + change;
+                dateUpdated = DateTime.Now.Ticks;
+                return _balance = d;
+            }
+
+            public string ToString(decimal ratePerDay)
+            {
+                StringBuilder builder = new StringBuilder(ComputeBalance(ratePerDay).ToString()).Append('&').Append((int)type); // Format: balance&type (ex: 123.45&0)
                 foreach (var tx in History)
                 {
                     builder
@@ -530,7 +562,6 @@ namespace Server
                     .Append('&')
                     .Append(tx.amount.ToString());
                     if (tx.meta != null) builder.Append('&').Append(tx.meta.ToBase64String());
-                    //builder.Append('}');
                 }
                 return builder.ToString();
             }
@@ -545,8 +576,7 @@ namespace Server
             public string Salt { get; internal set; }
             public List<Account> accounts = new List<Account>();
 
-            private User()
+            private User() { }
-            { }
 
             public User(User copy)
             {
@@ -586,7 +616,9 @@ namespace Server
                 {
                     Entry acc = new Entry("Account")
                         .AddNested("Name", account.name)
-                        .AddNested(new Entry("Balance", account.balance.ToString()).AddAttribute("omit", "true"));
+                        .AddNested(new Entry("Balance", account.UncomputedBalance.ToString()).AddAttribute("omit", "true"))
+                        .AddNested("ChangeTime", account.dateUpdated.ToString())
+                        .AddNested("Type", ((int)account.type).ToString());
                     foreach (var transaction in account.History)
                     {
                         Entry tx =
@@ -618,6 +650,8 @@ namespace Server
                     {
                         string name = null;
                         decimal balance = 0;
+                        long changeTime = -1;
+                        Account.AccountType type = Account.AccountType.Savings;
                         List<Transaction> history = new List<Transaction>();
                         foreach (var accountData in entry.NestedEntries)
                         {
@@ -650,13 +684,15 @@ namespace Server
                                 else history.Add(new Transaction(from, to, amount, meta, fromAccount, toAccount));
                             }
                             else if (accountData.Name.Equals("Balance")) balance = decimal.TryParse(accountData.Text, out decimal l) ? l : 0;
+                            else if (accountData.Name.Equals("ChangeTime")) changeTime = long.TryParse(accountData.Text, out changeTime) ? changeTime : -1;
+                            else if (accountData.Name.Equals("Type") && int.TryParse(accountData.Text, out int result)) type = (Account.AccountType)result;
                         }
                         if (name == null || balance < 0)
                         {
                             Output.Fatal($"Found errant account entry! Detected user name: {user.Name}");
                             return null; // This is a hard error
                         }
-                        Account a = new Account(user, balance, name);
+                        Account a = new Account(user, balance, name, type, changeTime);
                         a.History.AddRange(history);
                         user.AddAccount(a);
                     }

Server/Program.cs

@@ -24,6 +24,7 @@ Use command 'help' to get a list of available commands";
         // Specific error reference localization prefix
         private const string VERBOSE_RESPONSE = "@string/REMOTE_";
         public static int verbosity = 2;
+        const decimal ratePerDay = 0.5M; // Savings account has a growth rate of 150% per day
         public static void Main(string[] args)
         {
             // Create a client session manager and allow sessions to remain valid for up to 5 minutes of inactivity (300 seconds)
@@ -220,16 +221,23 @@ Use command 'help' to get a list of available commands";
                             }
                         case "Account_Create": // Create an account
                             {
-                                if (!ParseDataPair(cmd[1], out string session, out string name) || // Get session id and account name
+                                if (ParseDataSet(cmd[1], out string[] dataset)==-1 || // Get session id and account name
-                                    !GetUser(session, out var user) || // Get user associated with session id
+                                    !GetUser(dataset[0], out var user) || // Get user associated with session id
-                                    GetAccount(name, user, out var account))
+                                    GetAccount(dataset[1], user, out var account) || // Check if an account with this name already exists
+                                    !bool.TryParse(dataset[2], out bool checking)) // Check what account type to create
                                 {
                                     // Don't print input data to output in case sensitive information was included
-                                    Output.Error($"Failed to create account \"{name}\" for user \"{manager.GetUser(session).Name}\" (sessionID={session})");
+                                    Output.Error($"Failed to create account \"{dataset[1]}\" for user \"{manager.GetUser(dataset[0]).Name}\" (sessionID={dataset[0]})");
                                     return ErrorResponse(id);
                                 }
-                                manager.Refresh(session);
+                                manager.Refresh(dataset[0]);
-                                user.accounts.Add(new Database.Account(user, 0, name));
+                                user.accounts.Add(new Database.Account(
+                                    user,
+                                    0,
+                                    dataset[1],
+                                    checking ? Database.Account.AccountType.Checking : Database.Account.AccountType.Savings,
+                                    DateTime.Now.Ticks
+                                    ));
                                 db.UpdateUser(user); // Notify database of the update
                                 return GenerateResponse(id, true);
                             }
@@ -261,7 +269,7 @@ Use command 'help' to get a list of available commands";
                                     error += "unprivsysins";    // Unprivileged request for system-sourced transfer
                                 else if (!decimal.TryParse(data[4], out amount) || amount < 0)
                                     error += "badbalance";      // Given sum was not a valid amount
-                                else if ((!user.IsAdministrator && !systemInsert && amount > account.balance))
+                                else if ((!user.IsAdministrator && !systemInsert && amount > account.ComputeBalance(ratePerDay)))
                                     error += "insufficient";    // Insufficient funds in the source account
                                 
                                 // Checks if an error ocurred and handles such a situation appropriately
@@ -282,6 +290,7 @@ Use command 'help' to get a list of available commands";
                                         amount,
                                         account.name,
                                         tAccount.name,
+                                        ratePerDay,
                                         data.Length == 6 ? data[5] : null
                                     ));
                             }
@@ -291,8 +300,8 @@ Use command 'help' to get a list of available commands";
                                 Database.Account account = null;
                                 if (!ParseDataPair(cmd[1], out string session, out string name) || // Get session id and account name
                                     !GetUser(session, out user) || // Get user associated with session id
-                                    !GetAccount(name, user, out account) ||
+                                    !GetAccount(name, user, out account)/* ||
-                                    account.balance != 0)
+                                    account.UncomputedBalance != 0*/) // Get uncomputed balance since computing the balance would mae it impossible to close accounts (deprecated)
                                 {
                                     // Don't print input data to output in case sensitive information was included
                                     Output.Error($"Recieved problematic session id or account name!");
@@ -321,9 +330,9 @@ Use command 'help' to get a list of available commands";
                                     return ErrorResponse(id, (user == null ? "badsession" : account == null ? "badacc" : "badmsg"));
                                 }
                                 manager.Refresh(session);
-                                // Response example: "123.45{Sm9obiBEb2U=&Sm9obnMgQWNjb3VudA==&SmFuZSBEb2U=&SmFuZXMgQWNjb3VudA==&123.45&SGV5IHRoZXJlIQ=="
+                                // Response example: "123.45&0{Sm9obiBEb2U=&Sm9obnMgQWNjb3VudA==&SmFuZSBEb2U=&SmFuZXMgQWNjb3VudA==&123.45&SGV5IHRoZXJlIQ=="
-                                // Exmaple data: balance=123.45, Transaction{to="John Doe", toAccount="Johns Account", from="Jane Doe", fromAccount="Janes Account", amount=123.45, meta="Hey there!"}
+                                // Exmaple data: balance=123.45, accountType=Savings, Transaction{to="John Doe", toAccount="Johns Account", from="Jane Doe", fromAccount="Janes Account", amount=123.45, meta="Hey there!"}
-                                return GenerateResponse(id, account.ToString());
+                                return GenerateResponse(id, account.ToString(ratePerDay));
                             }
                         case "Account_List": // List accounts associated with a certain user (doesn't give more than account names)
                             {
@@ -518,6 +527,7 @@ Use command 'help' to get a list of available commands";
             // Set up a persistent terminal-esque input design
             Output.OnNewLine = () => Output.WriteOverwritable(">> ");
             Output.Raw(CONSOLE_MOTD);
+            Output.Raw($"Rent rate set to: {ratePerDay} (growth of {(1+ratePerDay)*100}% per day)");
             Output.OnNewLine();
 
             // Server command loop