file reorg
convenience functions
gotta run