Working on subtyping. Have to commit before can sync. :(