Added some more methods and a viewer