Starting on fixing server lib