added everything except layouts