Conditionals assignment

Final commit