IDEA Commit

Working within IDEA again - may flit between IDEA and NetBeans until I'm
used to IDEA.