0.1

Fixing and Testing where the branch version didn't merge.