Move everything into class