First "stable" build (WIP)