Build 0.0.40 - Tests passing now