most functionality working, prepping for redesign