final functional commit. clean up to follow.