updated
nearly there.
setup properly..