Work-in-progress on OAD, also cleaned up naming.