Feel free to fix it up; my goal right now is to get something working for the demo ; )