Designing out the plugin now
Cleaning up tests for existing design