Final commit before demo. Removed Toolkit function because it didn't seem to do anything. Also added some javadoc