big one

changed a lot and some of the new featuers need to be fixed