Mac Backup (USE PREVIOUS COMMIT)

This is an unstable version of what I was working on, using the temp
computer.