orting out mess - reverting to the latest correct commit (before merges)