Should work now, need clean up