Removed old methods, substituted in new ones. Next to fix up unit tests