Fixed and Fully working

There have been a lot of changes.
It is fully working and there are more changes to come.