Rearranged a bit

Added status updates and some comments