Feature/technic conversion

Conversion complete ready for testing