Fixed up logic and everything is golden