yeha nearly finished
up to states
and fixing conversion problems