Command Clean Up

This new way is better for performance and also not as cluttered. Only thing needed are more tests. ;)