Incorporated some design and functionality from the prototype