Restarted, needs includes redone

Hopefully no blue screen this time.