Re-write of the level class underway