more work on new

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

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