Began adding DB saving