Start to update the model aliases
Work on the base model API
Update the TODOs