Started add custom exercise (to be continued)
fix conflicts
fix conflicts