Working on build system. Need to modify subtree build systems now