Needs cleaned up

Untested