Added add, cleanup and decom. Continued building