Created by: erciccione
Closes #588 (closed) Closes #590 (closed) Closes #595 (closed) Closes #598 (closed)