Prepare for the recording errors
Trivial comment
Restructure and start working with promises