Ariel content

all the stuff from the to do list and merged master into it as well