Build ready & tests almost working now