progress. still a bit murky :rage1: