Working towards preserving signatures. Code is in a valid state