Added basic viewing capabilities