Reworked the API a bit to be more like the apple annotations. Having issues with deleting