finished, needs styling and popup (in new branch)