Added categories and flow control for it in reference to #2