Cleaned up 1.3.6. Started on 1.6.12.