1.1.2 and 1.1.3 first pass complete