Bugsquashing

Started working on this new project, please take a look asap