All functionality working

Almost ready - just need to add delete membership; plus API