Work on #224
build