Integrating Lucas Boko's frontend work