Application is now complete, needs some code cleaning and bug tracking