Front loading complete
Updating TODO