Working on generalizing platforms, need to worry about backcompat still