moving code from this weekend in- partially works here