Progress on links component