restructure the things. again.