Almost Test build refactored.. but don't work yet