Continuation of horrible build solution