Initial Commit

Code from Matt Hall (codebeef)