First pass, many improvements to come

Signed-off-by: Cody Massin <keyosk@gmail.com>