Almost finished

Just spinner remaining