made comp objects like I shoulda from the beginning. now to rewrite some things