refactoring and some new stuff

prepared the class to insert interests