wip the rest of level 2. fixed issue from earlier