Started sorting stuff

Signed-off-by: Kim Oxlund <hello@kimoxlund.com>
v2 progress

Signed-off-by: Kim Oxlund <hello@kimoxlund.com>