0.0.2
moving over more code