Make things pretty; implement work
Major refactoring; implement components