Fixes; start refactoring clientside