Feature/bools