Second Draft

============

New
---
* tests added

Changes
-------
* (some) Bugs fixed

Bugs
----
* save/load bug still exist (look at the message of the commit cf43bd9cb5187515be05a5311e06da4b22fa889d)

-boraalper4