all working

still have little edits to make