Refactoring work. Not quite done. Asset manager partially in.