Make this integrate better with framework, still needs lots of work