Fixed bug - 85% done