Reuncomment gemfile, update todo