WIP

still working cleaning up after itself a bit better