works now, need to be cleaned up