Semi-mega overhaul
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>