Initial upload

Uploading previous work that Mario did to GitHub.