Added a bunch o'stuff

See above