wip challenge refactor
challenge refactor part 3, strange behavior with removing objects (won't remove?)