SF Build; gonna start unit testing, and optimization