Restructured to include database. Still optimizing - error in block
addition