Looking good, need to retest with master though