Adding new code (not working, unhappily)
Major fixes in everything
Changind some draws