Need to clean up a little but good location