Data dump

Committing some changes, saving / loading does not work properly yet.