Updated with some tests for preliminary alpha