Mainly restructure. Not so much code, if any...