First additions and tests
Fixing, updating