Lots of updates with new changes
updated with some latest changes, more to come