Added some features, need to figure somethings out