Finished All Methods

Need to look at caching, but everything else is done.