Continued dev work on 1.0.1