Separated classes. Yay pushed code