more progress. going to move resting stuff over