re-organized for autobuild
autobuild now works :)