Added logic and fix dependicies
Fixing things
Fixes
Merge pull request #2 from TheJazi13/fixes

Fixes