Second feature first commit

@hedleyroos please review