Initial quick commit, I'll check it tomorrow to make sure it works.