Just temporary commit.

Fixing issue #75 still in WIP but need to push to show some weird code