First working version.

Some issues with the free methods; need to look into those.