Review21

Ready to be merged. Will be branching of this one to start working on the new way to handle deepfin/stringtoobejct.