Importing everything James has done on this plugin so far