more WIP in getting this shit working