Building. Approaching tests passing.