More Work on level class