Changed to numpy

Still in progress.