Feature complete 0.3a