Removed some classes, added new ones. Started including testing in development. Tests not pushed to git.