Getting closer to compilable state