Might have finished the ER-diagram...