Continued work on 1.0.1