Moved some things around, now using ajax