Revision added, need to finish this before wednesday