cleared code
done some mocking