Partially working change queue
Partial Fixes for #11