Initial commit
yay so many fix
Again some moving around...