Further work and added todos