Finished up with the stream interface, this looks pretty solid now, moved on to the connector interface. Also split out the features request/response structure into it's own file, this makes it cleaner and easier to update.
Fixed merge conflict