Moved some code + deleted old code + fixed #14 it was a typo....