Added base code, and cleaned up all other templates