new build
New structure w/ specs, refactoring