started working on wacky conditional and forgot to commit