Started work on a proper module