Fixing things
Add hoisting support