add conditionals all around

groundwork for more functionality … 3am time for sleep