Issue #5:
Almost done moving to MVP. About to optimize the code by removing
useless code.