added more things but still a work in progress