slowly but almost getting there...