moar POC refactors