Inital work on testing.
Added Guard