Commit of broken in-progress stuff so psychow can save me