Incremental steps closer to functionality