A bunch of stuff

Added most of the stuff