Added some 'this' references that were needed, renamed some create methods that needed to be unique.