More work on this. Error happening somewhere.