Plugin system added and basic functionality tested