Major refactoring to use an array of objects for frames. First test passing.
Pass second test