first steps moving to separate rules