WIP #6

Work done.