initial commit
trying to fix merge
removed checkbox limit nonsense