finalising initial prototype