started reorganizing in prep for subresource code [see #7]