Some stuff before I merge branches...OK, it's actually a lot of stuff