Some design stuff.
Design merged with Erikko.
Merged design with demo threads.