First cut of unvalidated coding done