LK - refactor into classes, remove dumb stuff