Functionized things, reorganized functions into classes