started on making it more portable