Trying to switch from data aquisition phase back to implementation
Added arithmetic and fixed a few bugs