Beginning conditionals

should commit more often