Theoreticaly almost ready to source...
cleaning up the mistakes...