closer. still needs regex work