Work so far

Adding the work done so far before changing the UI