Updated master ready. I will make it far more interactive soon. Code to
be checked over at this time though.