Went plugin shopping, added features