removed some code to make it a little more flexible/easier to maintain v...

Wanted you to see some of the changes I made.  I dont think its ready to be integrated yet.