More work on new

Signed-off-by: Jason Kuster <unexpectedapocalypse@gmail.com>
Dumbest merge ever

Signed-off-by: Jason Kuster <unexpectedapocalypse@gmail.com>