A lot fo updates to logic, plus signature file