Initial Bill 54 commit