Changed state targets to queue - not fully tested/implemented