Bug with gsub
Added better queueing, added notifier