Start implementing data pre-processing + More error messages