First draft, sans route traversal