Cleanup and use ploy

WIP!

Don't merge yet!