started adding server funcionality