Second commit

Added a bunch of stuff!