Basic code done except formatting