Fleshed out level constructor
Merged some from old branch