most functions now working
moving on