All done, just need to clean up some unused fn's