Add concrete start locations for shapes. Fix n bug
Add test code