Finishing up stuff @koppelaar 's office