Commiting changes from laptop
Added files from laptop. Functionality is now spread into many files.