COmmitting stuff to make things work after a long period of inactivity