In progress
Added boolean type, and if conditional