Final additions

Calling this done (although it’s far from perfect)