Feature/resource view

HOLD OFF ON MERGING