Major refactor of client and main