More work on stuff

Signed-off-by: Christian Smith <christian@gi.md>