Minor refactoring + can draw lines now!