Passing around dictionaries instead
Fixed put away view