fixed merge issues
Merge pull request #85 from kexline4710/experimental

Experimental
things deleted I think
fixed merge conflicts