Got things mostly working