Added some features, not finished with control gui