Few more problems, added framework for more