Close to being deployable standalone, but not there yet