diff --git a/cachematrix.R b/cachematrix.R
index a50be65aa44..5f43cf077e7 100644
--- a/cachematrix.R
+++ b/cachematrix.R
@@ -1,15 +1,35 @@
-## Put comments here that give an overall description of what your
-## functions do
-
-## Write a short comment describing this function
-
 makeCacheMatrix <- function(x = matrix()) {
-
+		#This function creates a special "matrix" object that can cache its inverse.
+		inverse<-NULL 
+		set <- function(y){
+			x<<-y
+			inverse<<-NULL 
+			#this means if we change the matrix, we won't retain the old, now incorrect inverse
+		}
+		get <- function() x
+		setinverse <- function(inv) inverse<<-inv
+		getinverse <- function() inverse
+		#return list of functions
+		list(set=set, get=get, setinverse=setinverse, getinverse=getinverse) 
 }
 
 
-## Write a short comment describing this function
 
 cacheSolve <- function(x, ...) {
         ## Return a matrix that is the inverse of 'x'
+        # This function computes the inverse of the special "matrix" returned by makeCacheMatrix above. 
+        #If the inverse has already been calculated (and the matrix has not changed),
+        # then the cachesolve should retrieve the inverse from the cache.
+        inverse<-x$getinverse()
+        if(!is.null(inverse)){
+        	message("getting cached data")
+            return(inverse)
+        }
+        data<-x$get()
+        inverse<-solve(data, ...) 
+        #ellipses in case we want to pass additional arguments to solve()
+        #note the ellipses in the function def that implies this functionality
+        #is desired
+        x$setinverse(inverse) #set it for caching
+        inverse #return
 }