added TODO's for optimisation and bug fixes