A (hopefully) better version of my 436 Project