Cleaned up files, added WIP client