basically done
everything seems to work