Initial devel

Almost done.