Moar functionality added and mad changes