Working on persistence and DI model. Not sure if I'm doing this right
yet...