Some moving around from classes