Implemented basic functionality in 1.3