Finished separation of data and logic.