Merge Basic Framework

Let's cut down on branches, eh?