Preliminary fix

Big update because they changed everything. *Sigh*