WIP for Objectified Implementation