First commit again

A bit messy, but hopefully will sort it out as I update the plugin