All basic funcitonality finished. About to add spinner