Cleaned up code+TODOs and reenabled backstack adding [untested]