Still getting it to a functional state