Added new classes, created views, lots of testing.