add x and + to program
finished all conversions
add final piece
fix merge
finished
fix merge and add final touch to project