! Forgot a few things here...

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>