More WIP

Signed-off-by: Eli Skeggs <eskeggs@globesherpa.com>