A few updates
Working on tests