Attempted to unite front-end with Eric's code.