initial branch commit --unshapely code