Pretty much finished with build systems, time to start testing and tidying up