Added Guard support

This really improves development stage.