additonal 3A changes
Merge branch 'master' of https://github.com/parkerjosephfl/Unhinged