Serious reworks

Here marks the start of beautiful things.