Moved more things
Started to add results function
Extended results