Work in progress
Working still
More fixs