Added FIXME notes
Code organization