Simplify code
Set up build step, add intial build