Feature/conditions

I'll issue a squash merge