WIP milestone1 misc initialization edge cases