Pushing the right stuff this time.
Merged everything together nice and good.