Added assertThis to deal with multiple asserts
Merged stuff
Working product. Need to finish documentation and UI formatting.