put stuff in classes
resolved conflict