Merging with MonTrell

[GameHead64]

• all of MonTrell's changes should be in this commit as well
• I've gotten it to work with all of our changes (up to date with my branch)