New solution loader (WIP)