Adding more logic! Woo