finished most of basic part
merged with salahs changes