WIP-2

Signed-off-by: Christopher Larson <kergoth@gmail.com>