Updated main, added http server