WIP 04.27.2014 + some C++11 cleanup for delete/default members