Branch/performance

@BrettASwift @kadst43 would you mind reviewing?