Added some code, not going to work this way have to rethink.