Move some things around, put in TODO comments