Figured I should probably push up the newest version I have working...