Partial complete rewrite..