Second commit, basic configuration done. Hoping better this time