Start refactoring clientside