first step #539

Let's get this in as a first step.
Gets rid of branching but yeah I removed it.