First submission ready
To do list before submission 2/2