start integrating POF into main codebase
out step and property handling