More refactoring
Basic reflection added, still some artifacts