Create more basic classes. Small commit just to keep modification. Will be implemented later