Add comments and todo's, raked db