Partial work - in process of cleanup