Work thus far

Work thus far - also includes the DB