Inital added contitionals
Added some more tests
Added if staqtments