Initial Rebuild

Very Rough Rebuild, many small changes. Much to be done.