started working on this some more