WIP

Signed-off-by: John SJ Anderson <genehack@genehack.org>