checkin of working stuff!