Working Version

For some reason, the version I had on here lacked some critical
components