Mass restructure and added val command