Almost complete just some minor ui tweaks left