new code

New build code, which makes it a lot cleaner