Wait, I have to commit twice with this thing? Somethings wrong here :(