Added a lot of things, moved others around