Finished (kinda) implementing ODS