first batch of work on adding guards