Updated what's locked up now. Figuring to clean this up properly when I have a chance.