Moved to  a more OO arrangement