Starting finished adding the control structures - I really need some tests