Near finished Cleopatra

Changes and what needs to be finished