All new layout, levelgen tweaks, code refactor