Added a test unit test, implemented Level, plus a few modifications