Fixed #17, began plugins