Pulled from csusbdt/multiproj

fixed git added annotations. Multiproj working