PoC5 updates, and added decorator paradigm
Fixed up a few things to make create work
[merge] fix conflicts