Fix routing issues and alaising.
Commit sandbox code. Remove later.