Started work on expand function