moving towards pip, updating classes etc