! Finish the todo
! minor formatting adjustments

Signed-off-by: Spuds <spuds@spudsdesign.com>