Commit 2

Added a ton of new stuff.