Changes, primitive version working now