Days work

Work for today, added action oriented tests