Changed goals to use a handler for improved structure, also made the other two maps playable