Almost finished. Fixing references and then that it it

Signed-off-by: Callum <callum.terris@gmail.com>