Initial commit'
Working
adjusted sorting
merged with origin