Tested working

Still need em calculator and other functionality