Continued LCD, modularised it a bit