Restructure a bit, implement a simple program