Final commit before comments/deleting other stuff