initial first pass commit - working