Delegates added. Still working on it though