Mkowoods dev

refactored the code a bit so it should scale a little easier can you do me a favor and reset my user login (or maybe this is an enhancement request :))....