Major refactor with server prompt