Removed outdated todo
Fixed a bug with base class method calls

Methods were called on the class instead of individual objects.