Merge layer cyl

[chelseanfries]

This branch should have only necessary changes for integrating functionality Feel free to delete files if necessary, it was duplicated from layers_cylinders