Refactor generic system - not ready to merge