most features are working and added