some stuff working, planned next round of modifications