Removed batch framework, will be redone at a later date