Adding framework for this stuff