Adding old whiteboard code
Make things work together