big refactor.. again
kinda work now except for scope nesting
almost there! scope nesting
finally workssssss
milestone reached, update todo