bad code for some reason
adding ellie code
lots of stuff
Merge branch 'master' into bad