Added some stuff
WorkQueue almost works, need to sort out the validation mechanism