cleanup
Got a proof-of-concept version of the URL rewriting working