Damn, you really did have a lot planned! Alas, I don't think it is possible to add all that in two days, even if you didn't have to debug anything. I would keep it simple next time to get a lot more done.
