Rewrote utilities and added test/server libs