looking okay; need to fix up some things, but an okay demo for now
some improvements