fifth commit

basic functions working