organized classes + worked on builders