(It's been hard for me to tell because I've been switching back and forth across branches converting libraries to source builds)