Still broken, but some things in place