Back on track?

Had to delete some merge craziness GitHub put there.