0.4 initial alpha commit with SP support