Moved some things, and added a notebook