some work on stuff :)