Recurring shifts closes #1141 closes #1156 closes #1155 closes #1161 closes #1146 closes 1152

done, using state object now