Inital commit for laptop branch

Branch for work done on laptop before merging with master desktop version.