Wonky but finally done