moar POC refactors and additions