Commit dirty code, but working version. Next step clean