Level refactor (w/ bugs to fix)