redid makefile, got some of the http state machine to work