cleaned up ready for level based dev