Finished a test and added some button functionality. ( there is no time during the week :( )