Change neil

I made changes, that based on the old feature we talked about, many places is still hard coded. So this is a good phase that we can make and stop, review, talk about it and go head.