Added a lot of things...I should probably be committing more often :)