Add ability to freeze now, move things around for cleaner testing #12

Add ability to freeze now, move things around for cleaner testing #12 #54