31st Iteration

Preperation for swapping from MOCKdb to SQLiteDB