! Continuing rewrite

Signed-off-by: Jason Clemons <jason@xboxleaders.com>