intermediate commit; working on converting functions