Finally sort of working.