Major refactoring in progress
Add recordtype dependency
Major progress