Supply working
clean up, bugs, basic function