In Progress

Work as discussed patr0805