Some debugging done, more to go