More WIP, make plugins more generic and import into list in main