#228, #229, #230 state:done time:3:0 comment: re-commit to add in user stories