Refactoring online demo an removing the need for a servlet.