Added more data objects, refactored last batch, added placeholders for comments, started API wrapper