Wrapped up the coding.  Add butterfly test passes