Tidied up, added option parser