magical package namespace etc
fix match commands
return types..