First import
Added a lot
Fixes
Merge branch 'master' of https://github.com/stievie/Giddo