Moving completely works now, even if it is a bit messy, but it's better
to have it work and refactor later than refactor when it  doesn't work
at all!