Merge refactored code;
Mock implementations;
Asset Service added