Made changes suggested by Wade, and removed some unnecessary classes.