A shit load of work later...