moving stuff in to proper classes