Minor changes, some functionality

Nothing really works, I'm just doing this to sync.