First milestone commit; bare bones working