Bugfixing todo today move