Updated to latest API and started work on groups