Welp.
Merge pull request #743 from ESwordTheCat/7b#vbri1

Welp.