More work
Modified first line
Merged newbranch with master to test stuff