Coomit a working todo with bugs