More tests
Working in progress on plugin stuff
Work in progress on plugin stuff