improved comments + logic
work on upload test controller