Adding case logic for safer logic (and possible, if any, expandability)