It now compiles and runs. I'm done refactoring! Woo! It's an entity systemgit add * You have to do some clean up though.