finished glueing thing together. Several other thing were added/changed including a slight restructuring of the database