Initial Standalone Commit with Fixes from the CFLabs Repo