Added a bunch of stuff that may or may not work at all