first commit
Add shortcuts. Reduce complexity