Pulling Mario's Client work

Pulling Mario's development from his fork