fixed up everything to work with owen

could use a move order