mostly finished, implementing into cms