New branch to add further switches and options