I think I've got this working properly now?