Reorganized/Cleaned up
Add specs for new properties