Begun rule 1 and rule 6
Updated db