Add much better development infrastructure