Adds Functioniality, performance bug inhibits use