complete redesign

Signed-off-by: Kevin <kevin@eichenbergs.info>