refactor so the server doesn't do web processing
tidy
update
update
update
update
update