Refactoring from prototype into usable product. Commit milestone.