node plz work plz node
merge conflicts fixed
reorganized code