In the works for v1.5 - Updated November 17