We will discuss some of the local theory of rigid-analytic spaces including Tate's algebra, affinoid algebras, Washnitzer's algebra and dagger algebras. After we provide enough motivation we will discuss the results of research completed by myself and Professor Daqing Wan. The results of this research form a basis for generalizing Washnitzer's algebra.