asset controller refactoring in progress