Everything working. Just need to make it look nice