first commit of totally refactored thing.