Patch 1

Cleaned up some methods, got rid of some duplication, and added some of the methods talked about in the last e-mail.