More progress
hack hack hack