Friday night commit. done all db shit