Adding initial presence tests
Tidy code
Completed presence tests