Completed I think!  A little more testing will probably be necessary.

Signed-off-by: Daniel <Daniel@192.168.24.120>