Some Pull Request

Please pull from Francis' fork. Included new files for added happiness.