Potentially works now, but needs testing/debugging