Yay fixing things + rules oops