WIP: Redesign

Signed-off-by: Xmister <xmisterhu@gmail.com>