Started work on Level class, cleanup on other classes.