final version pre-freezer

Signed-off-by: buckie <wjmartino@gmail.com>