WIP: Clean code, set milestone.