removed extras for now; needs rewrite