- Implemented #41 and #48, will do testing now though to check for any broken features or differences.