WIP
WIP
In progress
WIP
Updated some files. Still WIP
Removed deprecated warning