Still moving things around and testing out model classes