renamed _wrap to wrap, amended todo
order of operations!!!!

still a bit of work to be done, not quite perfect yet. pretty ugly too.