Nateadditions

A merged branch all many of my additions and changes.