Small updates
Slowly refactoring and pushing to GPU