The drift currents and mixing is important for the dispersion and advection of oil in the ocean. However, it is difficult to model ocean currents correct in space and time due to the energetic eddies in the ocean. In an existing NFR project (BioWave) we d evelop a new model system that couples wave drift and ocean currents in a natural way and is thus able to use high quality forecast of the wave field, and the associated wave drift, to improve drift calculations in the ocean. In this proposal (OilWave) we aim at adapting this new model system to include wave-oil interaction (which are ignored in BioWave) to produces a more reliable system for forecasting oil drift. The main themes of the present proposal are i) to improve the upper ocean mixing scheme, ii ) improve parameterizations of small scale wave-oil interaction, and iii) validate the new system with observations from proposed field investigations, and from documented oil spill accidents.