Some progress on refactoring
Peer mostly finished
util.supports placeholders
More TODOs, refactoring