Refactored out new methods
Build vNext Project