made slight changes to structure; want to commit before branching