Fix To First Commit

Still trying to get this working properly.