Clean up entities
add methods to support commands
Add more commands