add combat module
add underscores to internal functions