ok not there yet but almost...