First working version

Needs amount formatting