refactor w/ goroutines

Signed-off-by: Barry Allard <barry.allard@gmail.com>
refactor, moar tools

Signed-off-by: Barry Allard <barry.allard@gmail.com>