Making progress, still need to fix stack overflow issue