Progress has been made :P