Under Construction - a few options are ready for unit tests