Level 2 Commit

All basic features completed for Level 0, 1, 2