@izzg__ has some very nice additions