moving some functions around and exporting utility functions.. might move them elsewhere sometime later