Reviewing Brandon's current work

@p4r4digm