We now have a sane program structure