The Container and Clickables

Initial tests included, code seems stable and merged fine with Kevin's code (the most recent).