Git fixes, code-first change, set up form for hakpak builder