Commit 13 - adding in conditionals