Totally half done work, but I need to commit