Workign an full submission process
More fixes