! A bit more cleanup ... need to do some work soon :P
Signed-off-by:Spuds <spuds@spudsdesign.com>