Conituning to add methods and clean up existing but not all have been tested yet