Secondary commit. Pushing what I have so far.