#13 started on some new functions