adding up swap and colors

Only last functionality of validation left