Still working on concept.
Further changes.