Current iteration; working on fixing updates