Merging old and new main
Updating TODO