Initial commit for local repo
Added DB hooks into Armando's code