Checkpoint. Going to implement new database layout