Move requires to where they're acutally, erm, required :-/
Pull hacky class method into the same class it's needed