Another path thingy
Untested cleaning additions