Partial issues implementation - #3 & #18.