GitLab

Added a number of TODO's which will be taken care of later. Performance
needs to be improved.  Also changed some of the content provider calls
to the batch API.