cecelia's not real stuff
i dont know
fixed merge conflicts
fixing some syntax errors
again