Some changes, working on 100%