Major changes
Cleaned up. depends on ~/bin now instead