Value classes added, todo finish