working on everything -- the forgotten commit
merged with stuff from yesterday