-Add DAMN architecture functionality
-Add a couple more changes