Added guard and started with some testing