Completed the STL Integration branch. Will merge to master today.