Started working on testing front end with thomas
Fixed merge conflict