Finished base plugin features.
Cleanup Code.