WIP: Fix the things

* Ill fix this message later

Signed-off-by: Brandon McAnsh <brandonm@matricom.net>