This will be complete by the deadline, we swear!