Surface gravity waves in the world’s oceans contain a renewable source of free power on the order of terawatts that has to this date not been commercially utilized. The division of Electricity at Uppsala University is developing a technology to harvest this energy. The technology is a point absorber type wave energy converter based on a direct-driven linear generator placed on the sea bed connected via a line to a buoy on the surface. The work in this thesis is focused mainly on the energy transport of ocean waves and on increasing the transfer of energy from the waves to the generator and load. Potential linear wave theory is used to describe the ocean waves and to derive the hydrodynamic forces that are exerted on the buoy. Expressions for the energy transport in polychromatic waves travelling over waters of finite depth are derived and extracted from measured time series of wave elevation collected at the Lysekil test site. The results are compared to existing solutions that uses the simpler deep water approximation. A Two-Body system wave energy converter model tuned to resonance in Swedish west coast sea states is developed based on the Lysekil project concept. The first indicative results are derived by using a linear resistive load. The concept is further extended by a coupled hydrodynamic and electromagnetic model with two more realistic non-linear load conditions. Results show that the use of the deep water approximation gives a too low energy transport in the time averaged as well as in the total instantaneous energy transport. Around the resonance frequency, a Two-Body System gives a power capture ratio of up to 80 percent. For more energetic sea states the power capture ratio decreases rapidly, indicating a smoother power output. The currents in the generator when using the Two-Body system is shown to be more evenly distributed compared to the conventional system, indicating a better utilization of the electrical equipment. Although the resonant nature of the system makes it sensitive to the shape of the wave spectrum, results indicate a threefold increase in annual power production compared to the conventional system.