Merging the API

@Xilef11 if it won't break too much now, I would like to merge the now-established api.  Then, to cleanup and dust blocks!!