Made some progress

This commit is because i need to clone new updates to my other computer.