even more progress. still a WIP.