Rearranged uri handling, just needs to put html in browser now