Cleaned up code a bit, made it possible for multiple objects to happen.
Updated Todo.