Initial commit in this branch

Pretty much just cleaned project