Closes #1019, Closes #1020, Closes #1021, Closes #1022, Closes #1023, 
Closes #1025, Closes #1026, Closes #1027, Closes #1028, Closes #1030