Code now ready and mostly up to styleguide snuff

Signed-off-by: Shane Gadsby <schme16@gmail.com>