Added webserver functionality and brought up to date with separate files