work on figuring more stuff out--may want to revert this commit