Adding changes to hopefully help the rest of the team w/ building w/ new ADT v17