final touches to this good god this is taking a while