Progress on adding methods for multiple objects lots of cleanup to do