Restructure a bit, added first unit test for PG connection!!!