Some more in direction of #5 and #6
initial implementation for #5 and #6 now up