Work on cleanup, attempts to build