Initial release, some testing has been done, clean-up