Still working...

Heavy changes...