pushing what I have so that Jon and I can both work on it, currently broken