changed structure again because the old way really didn't make that much sense...