Making up lost ground

Just recoding what was lost :/ (with a lot more frequent commits)