Some more wrapping up done @davidtame