Adding changes

Uploading changes that allow custom tools to be loaded into the basic
viewer.