comp working, needs tweaks