null checks
temp checkin
Beginnings of CLI