Broken work in progress. Revert this commit to get back to a salvageable state.