Updated Code. Cleaned static refrences. overall update.