More WIP

Signed-off-by: rick <rick@laptop03.(none)>