Database re-design + finished script