Type fixing / majority is hooked back up now, need to sort out filter…

Type fixing / majority is hooked back up now, need to sort out filter… #429