WIP: Do Not Merge - Pass the url suffix to handler functions explicitly

Do not merge until #120 and #119 have been merged.