Conditions Assignment

Finishing touches to ensure program runs correctly