Use classes; re-add authentication