2nd commit almost complete