Adding some stuff as inspired by @soffes, @holman