Fixes #7 and initial request handlers