Initial version still to clean up and debug