More WIP

Signed-off-by: Rick Taylor <rick@tropicalstormsoftware.com>
Rejigged a header file

Signed-off-by: Rick Taylor <rick@tropicalstormsoftware.com>
More WIP

Signed-off-by: Rick Taylor <rick@tropicalstormsoftware.com>