Initial new version.

Review me, please :D