Work in Progress #195
Work so far added so that all can use it #195