Adding levels, cleaning up as I refine my plan