Added ifndef guards
Cont testing