Began solidifying implementation