* Added Flex
* Updated unit tests
* Fixed bug in Frame highlighted by unit tests
* Moved some code out of frame into shared library since it's shared with flex