Completed #27 & #31 and then improvements for #24