Okay so it's still all broken (getting added to unavialable elements) BUT it is actually coming in a little faster, and the tests themselves are less retarded ;)