Issue 118 - Functionality complete - Design nearly complete