Finished some simplier methods and removed so uneccsary copy overs