add cvars + restructure