house cleaning
getting the navigation basic animation in place
more clean up
force conficl resolution, merica