Nearly working
Fixes for the scale being all stupid