Some changes in model.py Small fixes in steps and sample feature expanding. Initial commit for neutron and swift discovering