new build

rebuilt most of stuff