Commit before changing in defines. Done almost all.
Main functionality is done.