Finished using the array class, now just removing unused variables and functions