In the process of cleaning up the code. Moving between levels works well