Commit

Pretty much a restart from the previous commit