Devel checkin. working but with a few bugs.