Initial work, still need to test queue